bitkeeper revision 1.1236.43.10 (42441785goVzEeVsbXZ1yuI--vCldQ)

Clean ptwr flush error path: it has a lot in common with the normal
exit path.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index d92c03e7971a758c4ebec16d862498696d34f8df..5bb21216cfa30f29367ef9f10c48624a838dc55c 100644 (file)
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -2392,15 +2392,8 @@ void ptwr_flush(const int which)
              */
             memcpy(&pl1e[i], &ptwr_info[cpu].ptinfo[which].page[i],
                    (L1_PAGETABLE_ENTRIES - i) * sizeof(l1_pgentry_t));
-            unmap_domain_mem(pl1e);
-            ptwr_info[cpu].ptinfo[which].l1va = 0;
-            if ( (which == PTWR_PT_ACTIVE) && likely(!d->mm.shadow_mode) )
-            {
-                pl2e = &linear_l2_table[ptwr_info[cpu].ptinfo[which].l2_idx];
-                *pl2e = mk_l2_pgentry(l2_pgentry_val(*pl2e) | _PAGE_PRESENT); 
-            }
             domain_crash();
-            return;
+            break;
         }
         
         if ( unlikely(sl1e != NULL) )